removing moved code