Cleaning Up

Cleaned up some old code