Flowerhack/merge ssck and cl

LMS-2858
It doesn't look like you're using this in locator.py anywhere. Is that true?