Variant - further cleanup