Aikibudo, (original Aikido) much closer to the Yoseikan Aikido. The preservation of atemi waza and sutemi-waza are heavily part of the methodology. The Aikikai organizations has almost completely removed these methods. The combative nature has been removed.
The original aiki of Morihei Ueshiba included no sutemi waza. All that is the development of Minoru Mochizuki, founder of yoseikan.
The sutemi waza, you are correct, were a vital part of old-style aikido.
Best to you.