Now using more stuff from ELPA instead of submodules..
Cleanup