cleaned up errors from shenoi