Removed unneccesarry methods