Remove unused files and methods