FIX system rw
clean up