Removed rather unneccesary features.