wip - clean up

by fabian de lange