Removed some unused files and changed a silly implementation of a method