clean up of things left todo