removed left-over code