HAMA-770: code clean before patching