Fix coding style

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

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