v2.9.3 - Source code cleaning