Removed unused dependency on window service