Cleanup

Cleaned up some deprecated/commented code that was no longer in use.