Clean up a bit around domHandlers

Change-Id: If1e4cce5d0abe0b719e0d74190198eada13c3556
Merge "Clean up a bit around domHandlers"