remove unused performQuery() parameter
complexity improvements
fix method complexity