Remove unused submodules and replace some of them with their elpa counterparts