cleanup imports; flash display-core