Reader/writer no longer used

Remove the reader/writer lock as it is no
longer used and if it is needed I would
rather thing of other ways to do this as
getting the reader/writer lock usage incorrect
will mean deadlock.

Change-Id: I4518c25e65626dc5a77f4e899c258ff9da76fea1
Merge "Reader/writer no longer used"