Kevin/contribute cleanup