Dyn: cleanup unused code