fixing bugs around commenting out ui helpers, removing dead files