removing the uuid dependency