Updated to remove dependencies.