Latest REAG clean up