Some cleanup of Frame