Clean up and more spears and entities