Getting rid of dead code.
Getting rid of warnings