Ongoing effort to clean up the Shore settings :-(