sam: clean up