clean up unused methods and imports