cleaning up a few temlates and forms