dead code cleanup