requiredProperties fix and clean up