More cleanup
New preferred implementation.