Sodxtrmt code cleanup