Remove old modules, improved parser