cleanup unused function and import