Merge "Code cleaning" into lmp-preview-dev