removing unused forms; cleaning up templates