cleanup, add version #