Deleted boundaries and code commented
Merge branch 'dev'