Removed unused files and functions