Making things req'd, cleanup