Improve remove method. Use Xtend 2.6.0.