Cleaned up some old commented code