Remove a few edge-case features (for now?)
Merge pull request #21 from imulus/nuke

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