remove set and string stores and remove some unecessary requires