main: cfx: actually allow mock locations + cleanup

Summary: We had some duplicates here and also were not allowing mock locations as was the intent (typo). Fix and cleanup.

Test Plan: win

Reviewers: randall.rushing, synergy

Reviewed By: synergy

Differential Revision: http://review.codefirex.com/D396