Removed some unnessiary methods