Formalized integration system; AE2 integration; Cleanup