Removing the dependencies to properties files