Cleanup property definitions

Cleanup property definitions