Cherry picked derivative performance fixes from fix/performance and cleaned up code.