Clean up
Initial work on clay spawning