more equation cleanup