small cleanup of old commented out code