cleaned up properties and children