Cleanup of use of READ ONLY flag