Port of features to clean N7100 Source (Update2)