Add cleaner2 with simplifications