use custom .properties fix + cleanup