old code cleanup