squish structures, remove interned strings ?
tidy up headers
tidy up config.*
correct package.xml
remove pointless test