Asteroid entity work

+ Cleanup in World