Config/property clean up