Remove now uses a for loop