other: code cleanup