Removed unwanted comments and tests.