MMLC-68 Use base url so that we can run on prod. Clean up.