Remove hard coded strings