Revert "multiple fixes + uuid try"

This reverts commit f366f9de3e139dfc6e5571321328f2ec92d19471.