Cleanup of old commented code