Got rid of WBIM stuff