Deleted unnecessary methods and comments