Some cleanup done.