cleanup of left over code