Some cleanup needed here.