Incremental update

More cleanup