Remove left-over code from previous attempts.