cleaned up dead code