Optimise remove element