Moved two classes into global area and deleted two which Alina says she doesn't think are used.