Removing AOT