Removed demo stuff