Clean up for JB build