Removed uneeded code left in from fixing issue in previous commit