Remove unneded checks

Change-Id: I8e335ec2ecfdf098fe22ccc6adf8cd45ab30e671