Clean up code
- remove unused imports
- remove unused layouts