Removed logging and removed source file includes in demos