Clear out mess.
Clean up
New textures for upcoming project
More cleanup
merge upstream