remove properties files + bug fixes