Clean up commented code as the original code is in Git