Mass cleanup, classes and forms