Added ability to properly remove question sets