Cleanups, ebim2 is now longer around
Merge pull request #178 from fh/t/rm-ebim

Cleanups: ebim2 is now longer around