Cleaning the old POC files
Merge branch 'master' into Card