Added ability to disable cleanUI method