Commenting out some demo stuff