remove unneeded lines
Merge branch 'master' into small.cnf