v3.8 Level2 semi-completed and project cleanup