Remove never used "userquery" code