code cleanup
make uniqe local versions are avable