Unicorn & assets cleanup