cleaned more storage factory stringTemplate files