Removed external depencies