Cleanups: ebim2 is now longer around