Dead code removal

Remove some dead code, adds Override annotation to a couple of methods.