No issue - cleanup code
Merge branch 'release'