DAOv.2 - Removed legacy files