fix dalliance mixed content issue + cleanup imports