more strict context for remove