Removed dependency on Northstar.