continued vis-AOT conversion some cleanup