Bug removed, Code cleanup. entities can be contained multiple times by the same system.