, cleaning up other properties