knower cleanup

Please review @matthewsibigtroth