Move things back to user config