Builtin cleanup (@kaeza)