Update configs, remove extraneous skeleton elements