SQLRebuilder-5 General cleanup