Entity adding and removing was very buggy in single update. Changed to entirely queue based adding and removing.