Updated .r() and insure null on removed