Killed more unused imports, also changed FixityResult to use enum/enumset for fixity status