removed extraneous templates