misc static compile branch cleanup