Removed some dependecies