WIP clean up hacks on top of metal-views