More clean up for the scope processing