Eliminated unnecessary coupling checks