2nd clean up