multiple removes now work
Merge branch 'john'