Removed some canMakeObserveChecks for performance