Removed in_range from interface
Removed dead code for remove from interface