Removed Entity-World stuff