Remove some fluff
Final replacement of bor status