Make sure you cull requires that aren't being used as you refactor.  I don't see Filer in this file, for example.  Confirm you really need it, and other requires (you seem to make this mistake in other places too).