remove unnecessary query