Demo cleanup
Some serious size optimization