Compilation fix, cleanup of unused referenced assemblies