Started cleaning up configuration code