Cleaning up (unused files and imports)