remove more context-dependent code