Corrected docs and simplified remove query