cleanup of dead code. -Andrew