cleanup/tweak properties files/build