Changed property file to new, deprecated code removed