Remove unnecessary property test handlers that forced early start of CCW