cleanups: removing rules that declare classes.
merge conflicts
compile