Cleanup jb-mr2 for correct build