Bathroom - Continuation of demo, beginning of demo clean up