Cleanup in SnakConstructionService

Change-Id: I9f9551c99bd2e3855c7a9a41e076bacb87c037c0
Merge "Cleanup in SnakConstructionService"