Removing Toolkit dependencies