Moved out more demo junk