Removing dead code

Removing dead code (triggers warnings in some editors/code analyzers)