move unused code