Deleted unnecessary comments and a TODO