Rework handleBlockRequestMessage
Path code cleanup