cleanup CS #346

Job	Run time
cs-stan / Coding Standard & Static Analysis	34s
testsuite / testsuite-linux (8.3, sqlite, highest, false)	37s
testsuite / testsuite-linux (8.2, mysql, highest, false)	41s
testsuite / testsuite-linux (8.4, mysql, highest, false)	35s
testsuite / testsuite-linux (8.2, pgsql, highest, false)	36s
testsuite / testsuite-linux (8.5, sqlite, highest, false)	29s
testsuite / testsuite-linux (8.2, sqlite, lowest, false)	39s
	4m 11s

Provide feedback