master branch cleaned