The great integration / cleanup