cleanup part II