cleanup for version 6.2.0-ga1