cleanup-missing improvements