refactoring: remove Q from derivs