Code cleanup

Signed-off-by: Marc Delisle <marc@infomarc.info>
ChangeLog entry for fix of bug #2760

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