Remove a few edge-case features (for now?)