cleanup, delete dead code