clean up move controller vars