more removal of prefixes... done now I think :)