It turns out that I'm not using several of these properties yet, so I've just removed them.