Removing World from the code