Cleanup and update to Version 71