Removed code that shouldn't be there for user demos