Round one of cleanup