Shifted most assets to clumsy/utils