Cleaned working tree a little