Use BB_FEATURE_CLEAN_UP where appropriate