In progress refactering of Remove*