cleanup property calls