Basic clean up.