removed useless parts