whitespace, no-GPL, etc
more cleanup