remove unneded stuff part 2