Deleting some code.  Renaming.  Changing tests to reflect these changes