Clean up old commented code