Fixed contextual remove