Some cleanup before meeting with Melvin