Remove surplus comments and test code