Removed un-needed string variables