New CM interface + removed all the junk files