Removed unneeded methods and files