clean up of previous bugfix
clean up of previous bugfix

jamiebull1/eppy,santoshphilip/eppy,eayoungs/eppy,santoshphilip/eppy,eayoungs/eppy,jamiebull1/eppy,santoshphilip/eppy,eayoungs/eppy,jamiebull1/eppy