Removing legacy template `user` objects
Merge pull request #662 from andrewhayward/tweaks

Removing legacy template `user` objects