Removing defunct shift_template
Fixing bugs in schema