Simplfiy templates, get rid of registration