get rid of users and unused query