[DEV-1610] Minor cleanup