deleting stuff
fixed template