Remove uuid dependency