Remove some dead code
get rid of @Override warnings