cleanup old code paths