Code cleanup

A little housekeeping: delete some unused templates