Clean up of PropertyUtility