Cleaning up after Dom

Again.