Deleted unneeded comments and checks