TTT: minor cleanup