After 2nd clean-up

After 2nd clean-up