remove overly strict self checks