Remove Toolkit from being Required