Cleaned up dead code

Cleaned up dead code