got rid of orphan removal