Removed unnecessary/redundant methods