Cleaned more things up.