Tried to fix the remove, but this is not working either. Gave up.