Remove comments and unneeded tests and code