Wip/h3nk3 remove old inspect code