Add modules, comment out stuff that is provided by modules already