Dev

i think this should be in the remove, before emiiting 'remove'