Removed last dependency and consolidated.