Removed dead code
Cleanup