Removed string replace since this is taken care of in a different spot