code style (remove unused classes)
Fix for QueryParamPlaceHolder doesn't work with single quote