Remove ugly EOF code