Clean master branch

Cleaning master branch for latest code setup