+1 to the remove logic.
The methods in the POs should not contain logic.