Remove two settings and replace them with references to the new Board class