Consider classifying properties

The old ones need to be removed as they can't possible work any longer