Cleaned up some commented out code