Removed obsolete sql check and the html check with it
Some bugfixes