beta: Remove hacks from misc::deployment::vars

Change-Id: Iefdc4b7e53412a9dde6f40e38691110693c37a5d