inc version, clean-up unused