removed :demo command and object wrappers from the public scope