Some quick clean up.