remove unnecessary query on removing field