Remove debugging
removed unused dep 'when'