clean re-driven old code