Get rid of VM Tweaks

Change-Id: Id296d1fc68e43c893f3ecb1f56f708acb03cea80