Semicolon cleanup (and one unused method deleted).