Added the ability to remove entities