minor cleanups
MySQL 5.5.40