Remove dead code

Signed-off-by: Marc Delisle <marc@infomarc.info>
Remove break after exit

Signed-off-by: Marc Delisle <marc@infomarc.info>
Remove unused parameters

Signed-off-by: Marc Delisle <marc@infomarc.info>