More cleaning up after gavin