Orphan moving and deletion working properly