Clean up of place-trees code #5