Delete dead code
Code cleanup, delete dead code