Upgrade to Architect 3
Remove unused file
Merge branch 'architect3'