vagrant oem, misc cleanups