Added some unused files and unused imports