removed a bunch of comments and things