Merge "Remove old GS-Cleanup Job from Apex"