Cleaned some dependencies, easy to be integrated then.