Cleanup. Added necessary assemblies