#[hlubocky build - code cleaning]