Remove a bunch of useless comments and a class