Code cleanup made by XDK verson 0714.