Cleaning up commented code from source