removed merged stuff