(PDB-467) More changes for :use to :require and remove some old TODO's