Use BB_FEATURE_CLEAN_UP where appropriate
 -Erik
12 files changed