Cleaning some stuff up.