Cope with lone semicolons
Remove old cruft