Clean up most of the old x:line stuff