Removed debugging and unnessiary dependencies