dishlish template - clean up