Add remove (non)-implementation to iterator for 1.7