General cleanup - part 1.

* Removing unused vars
* Formatting
* Correcting missing edituser.twig