Completing 2nd cleanup