Removed unused methods and commented code