Cleanup property loading