More cleanup, Rake magic.