BUGS: clean up