Hotfix match loops
Remove un-necessary files