Remove Aircraft class altogether