GitLab

These aren't ever used from here, so why are we making a mess of them
here?

Change-Id: Ieb8b7397034f851e43d6b3f3353e361673ec95be