Revert "JWR bits and pieces"

This reverts commit 8810633b80a595d941702489109bf546c44c37fc.