Cleaning up, removing some bundled modes which I don't use or download from repos