Use sysenv for properties + remove old code