Remove more reminants of ext