Cleaned up (deprecated methods, bad metrics)

Removed metrics, cleaned up code, and removed a bunch of deprecated
methods. Huzzah for OCD!