Cleanup

Cleaned up some old code.