Simplify, canonical etc now owned by objects

Could become properties if desired