Removed a few features that sneaked in