remove duplicate schema code