Generic cleanup and additions