Redundant Code Removal

Moving some of the action over into external action has made some of the
other lines of code redundant. These changes remove those redundant
lines of code.