Removing extraneous case statement