Unnessesary methods removed