Got rid of DiscoverFloorUtility.java since we never use it, and DiscoverFloorUtilitiyTEST.java.

Also got rid of some code in CleanSweep.java that wasn't being used.