First pass commit for cleanup release