chg: dev: more code cleanup