Remove hard coded string...