Cleaning project + arkavon + mage update