change setup and remove some dependences