You should not remove this functionality, it is still useful.