Removed redundant files and methods