Cleaned some more things.