remove config  helper and consolidate classes