Cleaning demo code