Clean up imports and unused view