various simplifications