Deleted un-needed comments and functions