Removed sql specific stuff from base templates