Fix momentum includes
Undo makefile tweak, fix includes again
Removed old code, fixed bigbloom