remove move logic from controller