Remove unnecessary modules
Removing comments to correct functionality