Removed some redundant ng-show checks