Removing some features and cleaning up testing code.