Template cleanup
Template cleanup
User ops working