Remove Hard Coded Strings