Proper removing of the pads
Updating the query