Some cleanup from today