fix protection problem
make sure that moves are cleaned up on expcetion
remove spurious deprecation warning