Clean up templates and make sure we still have Context