formatting and removal of some unused templates