Cleaned up some extra commented out code.