More cleanup, bump 0.0.7