Get rid of includes and ALL JB refs