Cleanup: removed old properties.