Remove the last of JB-related stuff.