Clean up

Remove unused imports, member variables, funtions