[Observe-commits] 05/05: Numerious code cleaning