clean up of moved functions