diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
index 138e7a2869..ba299e406f 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -41,6 +41,7 @@ import {
     TaskListComponent,
     TaskListService
 } from 'ng2-activiti-tasklist';
+import { LogService } from 'ng2-alfresco-core';
 import { AlfrescoApiService } from 'ng2-alfresco-core';
 import {
     DataSorting,
@@ -133,6 +134,7 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
                 private router: Router,
                 private taskListService: TaskListService,
                 private apiService: AlfrescoApiService,
+                private logService: LogService,
                 formRenderingService: FormRenderingService,
                 formService: FormService) {
         this.dataTasks = new ObjectDataTableAdapter();
@@ -154,11 +156,11 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
         formRenderingService.setComponentTypeResolver('custom_stencil_01', () => CustomStencil01, true);
 
         formService.formLoaded.subscribe((e: FormEvent) => {
-            console.log(`Form loaded: ${e.form.id}`);
+            this.logService.log(`Form loaded: ${e.form.id}`);
         });
 
         formService.formFieldValueChanged.subscribe((e: FormFieldEvent) => {
-            console.log(`Field value changed. Form: ${e.form.id}, Field: ${e.field.id}, Value: ${e.field.value}`);
+            this.logService.log(`Field value changed. Form: ${e.form.id}, Field: ${e.field.id}, Value: ${e.field.value}`);
         });
 
         formService.validateDynamicTableRow.subscribe(
@@ -175,8 +177,8 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
         // Uncomment this block to see form event handling in action
         /*
         formService.formEvents.subscribe((event: Event) => {
-            console.log('Event fired:' + event.type);
-            console.log('Event Target:' + event.target);
+            this.logService.log('Event fired:' + event.type);
+            this.logService.log('Event Target:' + event.target);
         });
         */
     }
@@ -213,9 +215,9 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
         this.taskListService.tasksList$.subscribe(
             (tasks) => {
                 this.taskPagination = { count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total };
-                console.log({ count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total });
+                this.logService.log({ count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total });
             }, (err) => {
-                console.log('err' +  err);
+                this.logService.log('err' +  err);
             });
 
         if (this.router.url.includes('processes')) {
@@ -381,11 +383,11 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
     }
 
     onAuditClick(event: any) {
-        console.log(event);
+        this.logService.log(event);
     }
 
     onAuditError(event: any): void {
-        console.error('My custom error message' + event);
+        this.logService.error('My custom error message' + event);
     }
 
     onTaskCreated(data: any): void {
@@ -451,11 +453,11 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
     }
 
     onRowClick(event): void {
-        console.log(event);
+        this.logService.log(event);
     }
 
     onRowDblClick(event): void {
-        console.log(event);
+        this.logService.log(event);
     }
 
     isTaskCompleted(): boolean {
diff --git a/demo-shell-ng2/app/components/datatable/datatable-demo.component.ts b/demo-shell-ng2/app/components/datatable/datatable-demo.component.ts
index edfb96c497..067efd20e5 100644
--- a/demo-shell-ng2/app/components/datatable/datatable-demo.component.ts
+++ b/demo-shell-ng2/app/components/datatable/datatable-demo.component.ts
@@ -16,7 +16,7 @@
  */
 
 import { Component, Input } from '@angular/core';
-import { AlfrescoApiService } from 'ng2-alfresco-core';
+import { AlfrescoApiService, LogService } from 'ng2-alfresco-core';
 import { DataCellEvent, DataRowActionEvent, DataSorting, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 import { Observable } from 'rxjs/Rx';
 
@@ -45,7 +45,7 @@ export class DataTableDemoComponent {
         email: 'denys.vuika@alfresco.com'
     };
 
-    constructor(private apiService: AlfrescoApiService) {
+    constructor(private apiService: AlfrescoApiService, private logService: LogService) {
         this.reset();
     }
 
@@ -162,17 +162,17 @@ export class DataTableDemoComponent {
 
     onExecuteRowAction(event: DataRowActionEvent) {
         let args = event.value;
-        console.log(args.row);
-        console.log(args.action);
+        this.logService.log(args.row);
+        this.logService.log(args.action);
         window.alert(`My custom action: ${args.action.title}`);
     }
 
     onRowClick(event) {
-        console.log(event);
+        this.logService.log(event);
     }
 
     onRowDblClick(event) {
-        console.log(event);
+        this.logService.log(event);
     }
 
     getRowForNode() {
@@ -183,8 +183,8 @@ export class DataTableDemoComponent {
 
         Observable.fromPromise(this.apiService.getInstance().nodes
             .getNodeInfo('-my-', opts)).subscribe((data) => {
-                console.log('FUnNy');
-                console.log(data);
+                this.logService.log('FUnNy');
+                this.logService.log(data);
                 let objects = new ObjectDataTableAdapter([
                     {
                         id: data.id,
diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts
index 9c33269d76..49d32f859d 100644
--- a/demo-shell-ng2/app/components/files/files.component.ts
+++ b/demo-shell-ng2/app/components/files/files.component.ts
@@ -21,7 +21,7 @@ import { ActivatedRoute, Params, Router } from '@angular/router';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import {
     AlfrescoApiService, AlfrescoContentService, AlfrescoTranslationService, CreateFolderDialogComponent,
-    DownloadZipDialogComponent, FileUploadEvent, FolderCreatedEvent, NotificationService,
+    DownloadZipDialogComponent, FileUploadEvent, FolderCreatedEvent, LogService, NotificationService,
     SiteModel, UploadService
 } from 'ng2-alfresco-core';
 import { DataColumn, DataRow } from 'ng2-alfresco-datatable';
@@ -87,7 +87,8 @@ export class FilesComponent implements OnInit {
                 private dialog: MdDialog,
                 private translateService: AlfrescoTranslationService,
                 private router: Router,
-                @Optional() private route: ActivatedRoute) {
+                @Optional() private route: ActivatedRoute,
+                private logService: LogService) {
     }
 
     showFile(event) {
@@ -151,8 +152,8 @@ export class FilesComponent implements OnInit {
     }
 
     onFolderCreated(event: FolderCreatedEvent) {
-        console.log('FOLDER CREATED');
-        console.log(event);
+        this.logService.log('FOLDER CREATED');
+        this.logService.log(event);
         if (event && event.parentId === this.documentList.currentFolderId) {
             this.documentList.reload();
         }
@@ -197,8 +198,8 @@ export class FilesComponent implements OnInit {
         dialogRef.afterClosed().subscribe(folderName => {
             if (folderName) {
                 this.contentService.createFolder('', folderName, this.documentList.currentFolderId).subscribe(
-                    node => console.log(node),
-                    err => console.log(err)
+                    node => this.logService.log(node),
+                    err => this.logService.log(err)
                 );
             }
         });
@@ -264,7 +265,7 @@ export class FilesComponent implements OnInit {
                 }
             });
             dialogRef.afterClosed().subscribe(result => {
-                console.log(result);
+                this.logService.log(result);
             });
         }
     }
diff --git a/demo-shell-ng2/app/components/form/form-demo.component.ts b/demo-shell-ng2/app/components/form/form-demo.component.ts
index 73794196b2..2e5ee0e9d4 100644
--- a/demo-shell-ng2/app/components/form/form-demo.component.ts
+++ b/demo-shell-ng2/app/components/form/form-demo.component.ts
@@ -17,6 +17,7 @@
 
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormModel, FormService } from 'ng2-activiti-form';
+import { LogService } from 'ng2-alfresco-core';
 import { InMemoryFormService } from '../../services/in-memory-form.service';
 import { DemoForm } from './demo-form';
 
@@ -32,11 +33,11 @@ export class FormDemoComponent implements OnInit {
 
     form: FormModel;
 
-    constructor(@Inject(FormService) private formService: InMemoryFormService) {
+    constructor(@Inject(FormService) private formService: InMemoryFormService, private logSevice: LogService) {
         // Prevent default outcome actions
         formService.executeOutcome.subscribe(e => {
             e.preventDefault();
-            console.log(e.outcome);
+            this.logSevice.log(e.outcome);
         });
     }
 
diff --git a/demo-shell-ng2/app/components/form/form-list-demo.component.html b/demo-shell-ng2/app/components/form/form-list-demo.component.html
new file mode 100644
index 0000000000..2641ad8fab
--- /dev/null
+++ b/demo-shell-ng2/app/components/form/form-list-demo.component.html
@@ -0,0 +1,8 @@
+<adf-form-list [forms]="formList" (row-dblclick)="onRowDblClick($event)">
+</adf-form-list>
+<div class="form-container" *ngIf="!isEmptyForm()">
+    <adf-form [form]="form" [data]="restoredData">
+    </adf-form>
+</div>
+<button md-button (click)="store()" color="primary">{{'FORM-LIST.STORE' | translate }}</button>
+<button md-button (click)="restore()" color="primary">{{'FORM-LIST.RESTORE' | translate }}</button>
diff --git a/demo-shell-ng2/app/components/form/form-list-demo.component.scss b/demo-shell-ng2/app/components/form/form-list-demo.component.scss
new file mode 100644
index 0000000000..ee6f7a61fb
--- /dev/null
+++ b/demo-shell-ng2/app/components/form/form-list-demo.component.scss
@@ -0,0 +1,8 @@
+.form-container {
+    padding: 10px;
+}
+
+.store-form-container{
+    width: 80%;
+    height: 80%;
+}
diff --git a/demo-shell-ng2/app/components/form/form-list-demo.component.ts b/demo-shell-ng2/app/components/form/form-list-demo.component.ts
index 90b9eb930f..26082b65be 100644
--- a/demo-shell-ng2/app/components/form/form-list-demo.component.ts
+++ b/demo-shell-ng2/app/components/form/form-list-demo.component.ts
@@ -16,31 +16,13 @@
  */
 
 import { Component, ViewChild } from '@angular/core';
-import { FormModel, FormService } from 'ng2-activiti-form';
-import { ActivitiForm } from 'ng2-activiti-form';
+import { ActivitiForm, FormModel, FormService } from 'ng2-activiti-form';
+import { LogService } from 'ng2-alfresco-core';
 
 @Component({
     selector: 'form-list-demo',
-    template: `
-        <adf-form-list [forms]="formList" (row-dblclick)="onRowDblClick($event)">
-        </adf-form-list>
-        <div class="form-container" *ngIf="!isEmptyForm()">
-            <adf-form [form]="form" [data]="restoredData">
-            </adf-form>
-        </div>
-        <button md-button (click)="store()" color="primary">{{'FORM-LIST.STORE' | translate }}</button>
-        <button md-button (click)="restore()" color="primary">{{'FORM-LIST.RESTORE' | translate }}</button>
-    `,
-    styles: [`
-        .form-container {
-            padding: 10px;
-        }
-
-        .store-form-container{
-            width: 80%;
-            height: 80%;
-        }
-    `]
+    templateUrl: 'form-list-demo.component.html',
+    styleUrls: ['form-list-demo.component.scss']
 })
 export class FormListDemoComponent {
 
@@ -55,11 +37,11 @@ export class FormListDemoComponent {
     storedData: any = {};
     restoredData: any = {};
 
-    constructor(private formService: FormService) {
+    constructor(private formService: FormService, private logService: LogService) {
         // Prevent default outcome actions
         formService.executeOutcome.subscribe(e => {
             e.preventDefault();
-            console.log(e.outcome);
+            this.logService.log(e.outcome);
         });
     }
 
@@ -71,7 +53,7 @@ export class FormListDemoComponent {
             this.form = form;
         });
 
-        console.log(rowForm);
+        this.logService.log(rowForm);
     }
 
     isEmptyForm() {
@@ -80,9 +62,9 @@ export class FormListDemoComponent {
 
     store() {
         this.clone(this.activitiForm.form.values, this.storedData);
-        console.log('DATA SAVED');
-        console.log(this.storedData);
-        console.log('DATA SAVED');
+        this.logService.log('DATA SAVED');
+        this.logService.log(this.storedData);
+        this.logService.log('DATA SAVED');
         this.restoredData = null;
     }
 
diff --git a/demo-shell-ng2/app/services/in-memory-form.service.ts b/demo-shell-ng2/app/services/in-memory-form.service.ts
index cb8b5680ff..ae99c84095 100644
--- a/demo-shell-ng2/app/services/in-memory-form.service.ts
+++ b/demo-shell-ng2/app/services/in-memory-form.service.ts
@@ -53,13 +53,13 @@ export class InMemoryFormService extends FormService {
         // Uncomment this to use original call
         // return super.getRestFieldValues(taskId, fieldId);
 
-        console.log(`getRestFieldValues: ${taskId} => ${fieldId}`);
+        this.logService.log(`getRestFieldValues: ${taskId} => ${fieldId}`);
         return new Observable<FormFieldOption[]>(observer => {
             let field = this.data.rest.fields.find(
                 f => f.taskId === taskId && f.fieldId === fieldId
             );
             let values: FormFieldOption[] = field.values || [];
-            console.log(values);
+            this.logService.log(values);
             observer.next(values);
         });
     }
@@ -69,13 +69,13 @@ export class InMemoryFormService extends FormService {
         // Uncomment this to use original call
         // return super.getRestFieldValuesByProcessId(processDefinitionId, fieldId);
 
-        console.log(`getRestFieldValuesByProcessId: ${processDefinitionId} => ${fieldId}`);
+        this.logService.log(`getRestFieldValuesByProcessId: ${processDefinitionId} => ${fieldId}`);
         return new Observable<FormFieldOption[]>(observer => {
             let field = this.data.rest.fields.find(
                 f => f.processId === processDefinitionId && f.fieldId === fieldId
             );
             let values: FormFieldOption[] = field.values || [];
-            console.log(values);
+            this.logService.log(values);
             observer.next(values);
         });
     }
diff --git a/demo-shell-ng2/tslint.json b/demo-shell-ng2/tslint.json
index 879857c7d3..07a622dec7 100644
--- a/demo-shell-ng2/tslint.json
+++ b/demo-shell-ng2/tslint.json
@@ -40,6 +40,7 @@
         "no-consecutive-blank-lines": true,
         "no-console": [
             true,
+            "log",
             "debug",
             "info",
             "time",
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.ts b/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.ts
index 11791322e6..ebb17bad4f 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.ts
@@ -93,13 +93,11 @@ export class WidgetComponent implements AfterViewInit {
 
     /** @deprecated used only to trigger visibility engine, components should do that internally if needed */
     checkVisibility(field: FormFieldModel) {
-        console.log('WidgetComponent.checkVisibility was used only to trigger visibility engine, components should do that internally if needed');
         this.fieldChanged.emit(field);
     }
 
     /** @deprecated used only to trigger visibility engine, components should do that internally if needed */
     onFieldChanged(field: FormFieldModel) {
-        console.log('WidgetComponent.onFieldChanged was used only to trigger visibility engine, components should do that internally if needed');
         this.fieldChanged.emit(field);
     }
 
diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.ts b/ng2-components/ng2-activiti-form/src/services/form.service.ts
index aa83da6e06..487dc1eb48 100644
--- a/ng2-components/ng2-activiti-form/src/services/form.service.ts
+++ b/ng2-components/ng2-activiti-form/src/services/form.service.ts
@@ -52,7 +52,7 @@ export class FormService {
 
     constructor(private ecmModelService: EcmModelService,
                 private apiService: AlfrescoApiService,
-                private logService: LogService) {
+                protected logService: LogService) {
     }
 
     private get contentApi(): any {
@@ -155,7 +155,7 @@ export class FormService {
      * @returns {Observable<any>}
      */
     addFieldsToAForm(formId: string, formModel: FormDefinitionModel): Observable<any> {
-        console.log('addFieldsToAForm is deprecated in 1.7.0, use saveForm API instead');
+        this.logService.log('addFieldsToAForm is deprecated in 1.7.0, use saveForm API instead');
         return Observable.fromPromise(
             this.editorApi.saveForm(formId, formModel)
         );
@@ -173,10 +173,10 @@ export class FormService {
         return Observable.fromPromise(
             this.modelsApi.getModels(opts)
         )
-        .map(function (forms: any) {
-            return forms.data.find(formdata => formdata.name === name);
-        })
-        .catch(err => this.handleError(err));
+            .map(function (forms: any) {
+                return forms.data.find(formdata => formdata.name === name);
+            })
+            .catch(err => this.handleError(err));
     }
 
     /**
@@ -383,9 +383,9 @@ export class FormService {
         return Observable.fromPromise(this.usersWorkflowApi.getUsers(option))
             .switchMap((response: any) => <LightUserRepresentation[]> response.data || [])
             .map((user: any) => {
-                    user.userImage = this.getUserProfileImageApi(user.id);
-                    return Observable.of(user);
-                })
+                user.userImage = this.getUserProfileImageApi(user.id);
+                return Observable.of(user);
+            })
             .combineAll()
             .defaultIfEmpty([])
             .catch(err => this.handleError(err));
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.spec.ts
index 6e06bd039f..c75ee20772 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.spec.ts
@@ -173,6 +173,5 @@ class BasicButtonComponent {
     }
 
     onAuditClick(event: any) {
-        console.log(event);
     }
 }
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.ts b/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.ts
index ce4f6f4edb..033816999a 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Directive, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
+import { Directive, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 import { ContentService } from 'ng2-alfresco-core';
 import { ProcessService } from './../services/process.service';
 
@@ -29,7 +29,7 @@ const PDF_FORMAT: string = 'pdf';
         '(click)': 'onClickAudit()'
     }
 })
-export class ProcessAuditDirective implements OnInit, OnChanges {
+export class ProcessAuditDirective implements OnChanges {
 
     @Input('process-id')
     processId: string;
@@ -60,9 +60,6 @@ export class ProcessAuditDirective implements OnInit, OnChanges {
                 private processListService: ProcessService) {
     }
 
-    ngOnInit() {
-        console.log('OnInit');
-    }
     ngOnChanges(changes: SimpleChanges): void {
         if (!this.isValidType()) {
             this.setDefaultFormatType();
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-audit.directive.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-audit.directive.spec.ts
index a13e1dfaa8..4d0f45da6b 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/task-audit.directive.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-audit.directive.spec.ts
@@ -158,6 +158,5 @@ class BasicButtonComponent {
     }
 
     onAuditClick(event: any) {
-        console.log(event);
     }
 }
diff --git a/ng2-components/ng2-alfresco-core/index.ts b/ng2-components/ng2-alfresco-core/index.ts
index 3d5e2a0791..610c6e4f28 100644
--- a/ng2-components/ng2-alfresco-core/index.ts
+++ b/ng2-components/ng2-alfresco-core/index.ts
@@ -128,10 +128,6 @@ import { MimeTypeIconPipe } from './src/pipes/mime-type-icon.pipe';
 import { HighlightPipe } from './src/pipes/text-highlight.pipe';
 import { TimeAgoPipe } from './src/pipes/time-ago.pipe';
 
-import { AlfrescoMdlMenuDirective } from './src/components/material/mdl-menu.directive';
-import { AlfrescoMdlTextFieldDirective } from './src/components/material/mdl-textfield.directive';
-import { MDLDirective } from './src/components/material/mdl-upgrade-element.directive';
-
 export { ContextMenuModule } from './src/components/context-menu/context-menu.module';
 export { CardViewModule } from './src/components/view/card-view.module';
 export { CollapsableModule } from './src/components/collapsable/collapsable.module';
@@ -211,14 +207,6 @@ export function deprecatedProviders() {
     ];
 }
 
-export function obsoleteMdlDirectives() {
-    return [
-        MDLDirective,
-        AlfrescoMdlMenuDirective,
-        AlfrescoMdlTextFieldDirective
-    ];
-}
-
 export function pipes() {
     return [
         FileSizePipe,
@@ -255,7 +243,6 @@ export function createTranslateLoader(http: Http, logService: LogService) {
         CollapsableModule
     ],
     declarations: [
-        ...obsoleteMdlDirectives(),
         ...pipes(),
         LogoutDirective,
         UploadDirective,
@@ -298,7 +285,6 @@ export function createTranslateLoader(http: Http, logService: LogService) {
         CollapsableModule,
         PaginationModule,
         ToolbarModule,
-        ...obsoleteMdlDirectives(),
         ...pipes(),
         LogoutDirective,
         UploadDirective,
diff --git a/ng2-components/ng2-alfresco-core/src/components/material/mdl-menu.directive.ts b/ng2-components/ng2-alfresco-core/src/components/material/mdl-menu.directive.ts
deleted file mode 100644
index 2ad5671534..0000000000
--- a/ng2-components/ng2-alfresco-core/src/components/material/mdl-menu.directive.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { AfterViewInit, Directive, ElementRef } from '@angular/core';
-
-declare var componentHandler;
-
-@Directive({
-    selector: '[adf-mdl-menu], [alfresco-mdl-menu]'
-})
-export class AlfrescoMdlMenuDirective implements AfterViewInit {
-
-    constructor(private element: ElementRef) {}
-
-    ngAfterViewInit() {
-        if (componentHandler) {
-            let el = this.element.nativeElement;
-            el.classList.add('mdl-menu');
-            el.classList.add('mdl-js-menu');
-            el.classList.add('mdl-js-ripple-effect');
-            componentHandler.upgradeElement(el, 'MaterialMenu');
-        }
-    }
-}
diff --git a/ng2-components/ng2-alfresco-core/src/components/material/mdl-textfield.directive.ts b/ng2-components/ng2-alfresco-core/src/components/material/mdl-textfield.directive.ts
deleted file mode 100644
index e00ba8b067..0000000000
--- a/ng2-components/ng2-alfresco-core/src/components/material/mdl-textfield.directive.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { AfterViewInit, Directive, ElementRef } from '@angular/core';
-
-declare var componentHandler;
-
-@Directive({
-    selector: '[adf-mdl-textfield]], [alfresco-mdl-textfield]'
-})
-export class AlfrescoMdlTextFieldDirective implements AfterViewInit {
-
-    constructor(private element: ElementRef) {}
-
-    ngAfterViewInit() {
-        if (componentHandler) {
-            let el = this.element.nativeElement;
-            el.classList.add('mdl-textfield');
-            el.classList.add('mdl-js-textfield');
-            el.classList.add('mdl-textfield--floating-label');
-            componentHandler.upgradeElement(el, 'MaterialTextfield');
-        }
-    }
-}
diff --git a/ng2-components/ng2-alfresco-core/src/components/material/mdl-upgrade-element.directive.ts b/ng2-components/ng2-alfresco-core/src/components/material/mdl-upgrade-element.directive.ts
deleted file mode 100644
index 4d29853546..0000000000
--- a/ng2-components/ng2-alfresco-core/src/components/material/mdl-upgrade-element.directive.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { AfterViewInit, Directive } from '@angular/core';
-declare var componentHandler;
-
-@Directive({
-    selector: '[mdl]'
-})
-export class MDLDirective implements AfterViewInit {
-
-    constructor() {
-        console.log('MDLDirective is deprecated and should not be used.');
-    }
-
-    ngAfterViewInit() {
-        componentHandler.upgradeAllRegistered();
-    }
-}
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-mapitem.component.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-mapitem.component.ts
index bac11f547c..b0ec93b57c 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-mapitem.component.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-mapitem.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Component, Input, OnChanges } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { CardViewMapItemModel } from '../../models/card-view-mapitem.model';
 import { CardViewUpdateService } from '../../services/card-view-update.service';
 
@@ -25,16 +25,12 @@ import { CardViewUpdateService } from '../../services/card-view-update.service';
     styleUrls: ['./card-view-mapitem.component.scss']
 })
 
-export class CardViewMapItemComponent implements OnChanges {
+export class CardViewMapItemComponent {
     @Input()
     property: CardViewMapItemModel;
 
     constructor(private cardViewUpdateService: CardViewUpdateService) {}
 
-    ngOnChanges() {
-        console.log();
-    }
-
     isClickable() {
         return this.property.clickable;
     }
diff --git a/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.html b/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.html
new file mode 100644
index 0000000000..feb674ee5f
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.html
@@ -0,0 +1,10 @@
+<h1 md-dialog-title>{{ 'CORE.DIALOG.DOWNLOAD_ZIP.TITLE' | translate }}</h1>
+<div md-dialog-content>
+    <md-progress-bar color="primary" mode="indeterminate"></md-progress-bar>
+</div>
+<div md-dialog-actions>
+    <span class="spacer"></span>
+    <button md-button color="primary" (click)="cancelDownload()">
+        {{ 'CORE.DIALOG.DOWNLOAD_ZIP.ACTIONS.CANCEL' | translate }}
+    </button>
+</div>
diff --git a/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.scss b/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.scss
new file mode 100644
index 0000000000..b303c8e461
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.scss
@@ -0,0 +1,5 @@
+.spacer { flex: 1 1 auto; }
+
+.adf-download-zip-dialog .mat-dialog-actions .mat-button-wrapper {
+    text-transform: uppercase;
+}
diff --git a/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.ts b/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.ts
index dc0fc0c0f3..ebd0759d29 100644
--- a/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.ts
+++ b/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.ts
@@ -17,31 +17,14 @@
 
 import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { MD_DIALOG_DATA, MdDialogRef } from '@angular/material';
-
 import { DownloadEntry, MinimalNodeEntity } from 'alfresco-js-api';
+import { LogService } from '../services/log.service';
 import { AlfrescoApiService } from './../services/alfresco-api.service';
 
 @Component({
     selector: 'adf-download-zip-dialog',
-    template: `
-        <h1 md-dialog-title>{{ 'CORE.DIALOG.DOWNLOAD_ZIP.TITLE' | translate }}</h1>
-        <div md-dialog-content>
-            <md-progress-bar color="primary" mode="indeterminate"></md-progress-bar>
-        </div>
-        <div md-dialog-actions>
-            <span class="spacer"></span>
-            <button md-button color="primary" (click)="cancelDownload()">
-                {{ 'CORE.DIALOG.DOWNLOAD_ZIP.ACTIONS.CANCEL' | translate }}
-            </button>
-        </div>
-    `,
-    styles: [`
-        .spacer { flex: 1 1 auto; }
-
-        .adf-download-zip-dialog .mat-dialog-actions .mat-button-wrapper {
-            text-transform: uppercase;
-        }
-    `],
+    templateUrl: './download-zip.dialog.html',
+    styleUrls: ['./download-zip.dialog.scss'],
     host: { 'class': 'adf-download-zip-dialog' },
     encapsulation: ViewEncapsulation.None
 })
@@ -52,7 +35,8 @@ export class DownloadZipDialogComponent implements OnInit {
 
     constructor(private apiService: AlfrescoApiService,
                 private dialogRef: MdDialogRef<DownloadZipDialogComponent>,
-                @Inject(MD_DIALOG_DATA) private data: { nodeIds?: string[] }) {
+                @Inject(MD_DIALOG_DATA) private data: { nodeIds?: string[] },
+                private logService: LogService) {
     }
 
     private get downloadsApi() {
@@ -74,7 +58,7 @@ export class DownloadZipDialogComponent implements OnInit {
                 if (!this.cancelled) {
                     this.downloadZip(this.data.nodeIds);
                 } else {
-                    console.log('Cancelled');
+                    this.logService.log('Cancelled');
                 }
             }, 0);
         }
@@ -90,17 +74,16 @@ export class DownloadZipDialogComponent implements OnInit {
 
             const promise: any = this.downloadsApi.createDownload({ nodeIds });
 
-            promise.on('progress', progress => console.log('Progress', progress));
-            promise.on('error', error => console.log('Error', error));
-            promise.on('abort', data => console.log('Abort', data));
+            promise.on('progress', progress => this.logService.log('Progress', progress));
+            promise.on('error', error => this.logService.error('Error', error));
+            promise.on('abort', data => this.logService.log('Abort', data));
 
             promise.on('success', (data: DownloadEntry) => {
-                console.log('Success', data);
                 if (data && data.entry && data.entry.id) {
                     const url = this.contentApi.getContentUrl(data.entry.id, true);
                     // the call is needed only to get the name of the package
                     this.nodesApi.getNode(data.entry.id).then((downloadNode: MinimalNodeEntity) => {
-                        console.log(downloadNode);
+                        this.logService.log(downloadNode);
                         const fileName = downloadNode.entry.name;
                         this.waitAndDownload(data.entry.id, url, fileName);
                     });
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts
index 78c2c5f70e..d9251befe2 100644
--- a/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts
@@ -21,6 +21,7 @@ import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
 import { StorageService } from './storage.service';
 import { UserPreferencesService } from './user-preferences.service';
+import { LogService } from './log.service';
 
 describe('AlfrescoSettingsService', () => {
 
@@ -35,7 +36,8 @@ describe('AlfrescoSettingsService', () => {
                 AlfrescoApiService,
                 AlfrescoSettingsService,
                 UserPreferencesService,
-                StorageService
+                StorageService,
+                LogService
             ]
         }).compileComponents();
     }));
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.ts
index abd96d52f8..9b2474e6d2 100644
--- a/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.ts
@@ -17,6 +17,7 @@
 
 import { Injectable } from '@angular/core';
 import { AppConfigService } from './app-config.service';
+import { LogService } from './log.service';
 import { UserPreferencesService } from './user-preferences.service';
 
 @Injectable()
@@ -24,52 +25,53 @@ export class AlfrescoSettingsService {
 
     constructor(
         private appConfig: AppConfigService,
+        private logService: LogService,
         private preferences: UserPreferencesService) {
     }
 
     /** @deprecated in 1.6.0 */
     public get ecmHost(): string {
-        console.log('AlfrescoSettingsService.ecmHost is deprecated. Use AppConfigService instead.');
+        this.logService.log('AlfrescoSettingsService.ecmHost is deprecated. Use AppConfigService instead.');
         return this.appConfig.get<string>('ecmHost');
     }
 
     /** @deprecated in 1.7.0 */
     public set csrfDisabled(csrfDisabled: boolean) {
-        console.log(`AlfrescoSettingsService.csrfDisabled is deprecated. Use UserPreferencesService.disableCSRF instead.`);
+        this.logService.log(`AlfrescoSettingsService.csrfDisabled is deprecated. Use UserPreferencesService.disableCSRF instead.`);
         this.preferences.disableCSRF = csrfDisabled;
     }
 
     /** @deprecated in 1.6.0 */
     public set ecmHost(ecmHostUrl: string) {
-        console.log('AlfrescoSettingsService.ecmHost is deprecated. Use AppConfigService instead.');
+        this.logService.log('AlfrescoSettingsService.ecmHost is deprecated. Use AppConfigService instead.');
     }
 
     /** @deprecated in 1.6.0 */
     public get bpmHost(): string {
-        console.log('AlfrescoSettingsService.bpmHost is deprecated. Use AppConfigService instead.');
+        this.logService.log('AlfrescoSettingsService.bpmHost is deprecated. Use AppConfigService instead.');
         return this.appConfig.get<string>('bpmHost');
     }
 
     /** @deprecated in 1.6.0 */
     public set bpmHost(bpmHostUrl: string) {
-        console.log('AlfrescoSettingsService.bpmHost is deprecated. Use AppConfigService instead.');
+        this.logService.log('AlfrescoSettingsService.bpmHost is deprecated. Use AppConfigService instead.');
     }
 
     /** @deprecated in 1.6.0 */
     public getBPMApiBaseUrl(): string {
-        console.log('AlfrescoSettingsService.getBPMApiBaseUrl is deprecated.');
+        this.logService.log('AlfrescoSettingsService.getBPMApiBaseUrl is deprecated.');
         return this.bpmHost + '/activiti-app';
     }
 
     /** @deprecated in 1.7.0 */
     public getProviders(): string {
-        console.log(`AlfrescoSettingsService.getProviders is deprecated. Use UserPreferencesService.authType instead.`);
+        this.logService.log(`AlfrescoSettingsService.getProviders is deprecated. Use UserPreferencesService.authType instead.`);
         return this.preferences.authType;
     }
 
     /** @deprecated in 1.7.0 */
     public setProviders(providers: string) {
-        console.log(`AlfrescoSettingsService.getProviders is deprecated. Use UserPreferencesService.authType instead.`);
+        this.logService.log(`AlfrescoSettingsService.getProviders is deprecated. Use UserPreferencesService.authType instead.`);
         this.preferences.authType = providers;
     }
 }
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts
index 068c0fb549..54a41a2291 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts
@@ -24,11 +24,13 @@ import { MaterialModule } from '../../material.module';
 import { DocumentListService } from '../../services/document-list.service';
 import { DocumentListComponent } from './../document-list.component';
 import { ContentColumnListComponent } from './content-column-list.component';
+import { LogService } from 'ng2-alfresco-core';
 
 describe('ContentColumnList', () => {
 
     let documentList: DocumentListComponent;
     let columnList: ContentColumnListComponent;
+    let logService: LogService;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -41,7 +43,8 @@ describe('ContentColumnList', () => {
                 DocumentListComponent
             ],
             providers: [
-                DocumentListService
+                DocumentListService,
+                LogService
             ],
             schemas: [
                 CUSTOM_ELEMENTS_SCHEMA
@@ -51,7 +54,8 @@ describe('ContentColumnList', () => {
 
     beforeEach(() => {
         documentList = (TestBed.createComponent(DocumentListComponent).componentInstance as DocumentListComponent);
-        columnList = new ContentColumnListComponent(documentList);
+        logService = TestBed.get(LogService);
+        columnList = new ContentColumnListComponent(documentList, logService);
 
         documentList.ngOnInit();
     });
@@ -69,7 +73,7 @@ describe('ContentColumnList', () => {
     });
 
     it('should require document list instance to register action', () => {
-        columnList = new ContentColumnListComponent(null);
+        columnList = new ContentColumnListComponent(null, logService);
         let col = <DataColumn> {};
         expect(columnList.registerColumn(col)).toBeFalsy();
     });
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.ts
index c2656a2b16..c241ab46e9 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.ts
@@ -18,6 +18,7 @@
  /* tslint:disable:component-selector  */
 
 import { Component } from '@angular/core';
+import { LogService } from 'ng2-alfresco-core';
 import { DataColumn } from 'ng2-alfresco-datatable';
 
 import { DocumentListComponent } from './../document-list.component';
@@ -28,8 +29,8 @@ import { DocumentListComponent } from './../document-list.component';
 })
 export class ContentColumnListComponent {
 
-    constructor(private documentList: DocumentListComponent) {
-        console.log('ContentColumnListComponent is deprecated starting with 1.7.0 and may be removed in future versions. Use DataColumnListComponent instead.');
+    constructor(private documentList: DocumentListComponent, private logService: LogService ) {
+        this.logService.log('ContentColumnListComponent is deprecated starting with 1.7.0 and may be removed in future versions. Use DataColumnListComponent instead.');
     }
 
     /**
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts
index 82691c24be..e14dba9ff6 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts
@@ -17,7 +17,7 @@
 
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, TestBed } from '@angular/core/testing';
-import { CoreModule } from 'ng2-alfresco-core';
+import { CoreModule, LogService } from 'ng2-alfresco-core';
 import { DataTableModule } from 'ng2-alfresco-datatable';
 import { MaterialModule } from '../../material.module';
 import { DocumentListService } from '../../services/document-list.service';
@@ -29,6 +29,7 @@ describe('ContentColumn', () => {
 
     let documentList: DocumentListComponent;
     let columnList: ContentColumnListComponent;
+    let logService: LogService;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -41,7 +42,8 @@ describe('ContentColumn', () => {
                 DocumentListComponent
             ],
             providers: [
-                DocumentListService
+                DocumentListService,
+                LogService
             ],
             schemas: [
                 CUSTOM_ELEMENTS_SCHEMA
@@ -51,7 +53,8 @@ describe('ContentColumn', () => {
 
     beforeEach(() => {
         documentList = (TestBed.createComponent(DocumentListComponent).componentInstance as DocumentListComponent);
-        columnList = new ContentColumnListComponent(documentList);
+        logService = TestBed.get(LogService);
+        columnList = new ContentColumnListComponent(documentList, logService);
 
         documentList.ngOnInit();
     });
@@ -59,7 +62,7 @@ describe('ContentColumn', () => {
     it('should register model within parent column list', () => {
         spyOn(columnList, 'registerColumn').and.callThrough();
 
-        let column = new ContentColumnComponent(columnList);
+        let column = new ContentColumnComponent(columnList, logService);
         column.ngAfterContentInit();
 
         expect(columnList.registerColumn).toHaveBeenCalled();
@@ -70,7 +73,7 @@ describe('ContentColumn', () => {
     });
 
     it('should setup screen reader title for thumbnail column', () => {
-        let column = new ContentColumnComponent(columnList);
+        let column = new ContentColumnComponent(columnList, logService);
         column.key = '$thumbnail';
         column.ngOnInit();
 
@@ -78,7 +81,7 @@ describe('ContentColumn', () => {
     });
 
     it('should register on init', () => {
-        let column = new ContentColumnComponent(columnList);
+        let column = new ContentColumnComponent(columnList, logService);
         spyOn(column, 'register').and.callThrough();
 
         column.ngAfterContentInit();
@@ -86,10 +89,10 @@ describe('ContentColumn', () => {
     });
 
     it('should require action list to register action with', () => {
-        let column = new ContentColumnComponent(columnList);
+        let column = new ContentColumnComponent(columnList, logService);
         expect(column.register()).toBeTruthy();
 
-        column = new ContentColumnComponent(null);
+        column = new ContentColumnComponent(null, logService);
         expect(column.register()).toBeFalsy();
     });
 
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts
index 2a052fd503..cd8bc4fab0 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts
@@ -18,6 +18,7 @@
  /* tslint:disable:component-selector  */
 
 import { AfterContentInit, Component, ContentChild, Input, OnInit, TemplateRef } from '@angular/core';
+import { LogService } from 'ng2-alfresco-core';
 import { DataColumn } from 'ng2-alfresco-datatable';
 
 import { ContentColumnListComponent } from './content-column-list.component';
@@ -55,8 +56,8 @@ export class ContentColumnComponent implements OnInit, AfterContentInit, DataCol
     @Input('class')
     cssClass: string;
 
-    constructor(private list: ContentColumnListComponent) {
-        console.log('ContentColumnComponent is deprecated starting with 1.7.0 and may be removed in future versions. Use DataColumnComponent instead.');
+    constructor(private list: ContentColumnListComponent, private logService: LogService) {
+        this.logService.log('ContentColumnComponent is deprecated starting with 1.7.0 and may be removed in future versions. Use DataColumnComponent instead.');
     }
 
     ngOnInit() {
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts
index 1cbcf7452b..4df2701326 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts
@@ -70,7 +70,6 @@ describe('DocumentList', () => {
     beforeEach(() => {
         eventMock = {
             preventDefault: function () {
-                console.log('mock preventDefault');
             }
         };
 
@@ -228,7 +227,6 @@ describe('DocumentList', () => {
     it('should not execute action without node provided', () => {
         let action = new ContentActionModel();
         action.handler = function () {
-            console.log('mock handler');
         };
 
         spyOn(action, 'handler').and.stub();
diff --git a/ng2-components/tslint.json b/ng2-components/tslint.json
index 3e47a8ba4e..4dfa36054b 100644
--- a/ng2-components/tslint.json
+++ b/ng2-components/tslint.json
@@ -41,6 +41,7 @@
         "no-consecutive-blank-lines": true,
         "no-console": [
             true,
+            "log",
             "debug",
             "info",
             "time",