Cleanup

Completing removing HTML into templates