Clean up unused code and imports