Strip out some Griddle stuff