Move functions, delete unused function.