Remove unused code from tr_bsp.cpp due to failed merge. Fix more errors pointed out by Amanieu