Sysrw and Sysro Clean up