Removing bad arguments from template 'remove'