Cleaned up some old code