Cleanup. Removed some "future features" and some misfeatures.