Cleaned up PropertyCollectionViewController.