Cleaned some stuff up.

Trying to figure out what happened.