More cleaning up
Further improvements. Included loading of sources, which used to be done by the c++ plugin, but as that one is disabled it is no longer done. Not all unit tests pass now.