Remove left-over code