removed useless stuffs