clense out the functionality that has never been really used much