Fix issue with removing parent and speed up the process
Fix issue with removing parent and speed up the process

gboushey/frontend,djvoa12/frontend,stopfstedt/frontend,djvoa12/frontend,ilios/frontend,dartajax/frontend,stopfstedt/frontend,gboushey/frontend,thecoolestguy/frontend,dartajax/frontend,jrjohnson/frontend,jrjohnson/frontend,ilios/frontend,gabycampagna/frontend,gabycampagna/frontend,thecoolestguy/frontend