More self contained cleanup.