forgot some whitespace cleanup
remove fhonour-copt and more cleanup
remove old sed lines