Remove some hard coded strings