Cleanup of 7.1