Flowerhack/merge ssck and cl

LMS-2858
You're going to remove the commented out lines, right?