Changed Remove like #1. moved AtomicRef to diff directory