cleanup: use CUSTOM_COMPONENT_PROPERTY property