Some cleanup from failed attempts.