Removed un-needed methods and variables