removed unused config
refactor out common