More commented out code