diff --git a/projects/common-map/src/fm-map/effects/map.effects.ts b/projects/common-map/src/fm-map/effects/map.effects.ts
index 5f45ea4..5e0ee0b 100644
--- a/projects/common-map/src/fm-map/effects/map.effects.ts
+++ b/projects/common-map/src/fm-map/effects/map.effects.ts
@@ -71,7 +71,7 @@ export class MapEffects {
   startSearch$: Observable<Action> = this.actions$.pipe(
     ofType(mapActions.STARTSEARCH),
     switchMap((action: mapActions.StartSearch) => {
-      console.log("Start search");
+      console.debug("Start search");
       var startDate = action.queryState.startDate;
       var endDate = action.queryState.endDate;    
       var newAction;
diff --git a/projects/common-map/src/fm-map/reducers/map.reducer.ts b/projects/common-map/src/fm-map/reducers/map.reducer.ts
index 8cfc528..01d4a14 100644
--- a/projects/common-map/src/fm-map/reducers/map.reducer.ts
+++ b/projects/common-map/src/fm-map/reducers/map.reducer.ts
@@ -268,7 +268,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       }
       var selectedBaseLayer: IItemLayer = null;
       var mapState = tassign(state.mapState);
-      console.log(`Base layerload: ${mapState.baseLayerCode}`)
+      console.debug(`Base layerload: ${mapState.baseLayerCode}`)
       if (baseLayers.length > 0 && mapState.baseLayerCode != "") {
         selectedBaseLayer = baseLayers.filter(layer => layer.item.code === mapState.baseLayerCode)[0];
         selectedBaseLayer.visible = true;
diff --git a/projects/common-map/src/fm-map/services/geolocation.service.ts b/projects/common-map/src/fm-map/services/geolocation.service.ts
index f7732dd..866a953 100644
--- a/projects/common-map/src/fm-map/services/geolocation.service.ts
+++ b/projects/common-map/src/fm-map/services/geolocation.service.ts
@@ -24,7 +24,7 @@ export class GeolocationService {
           observer.next(position);
         },
         (error: PositionError) => {
-          console.log('Geolocation service: ' + error.message);
+          console.debug('Geolocation service: ' + error.message);
           observer.error(error);
         },
         {
diff --git a/projects/common/src/fm/components/app/app.component.ts b/projects/common/src/fm/components/app/app.component.ts
index cafc2e8..8e92d2d 100644
--- a/projects/common/src/fm/components/app/app.component.ts
+++ b/projects/common/src/fm/components/app/app.component.ts
@@ -51,7 +51,7 @@ export class AppComponent implements OnInit, OnDestroy {
 
   getActionFromEvent(event: IEventMessage): Action {
     var action: Action = null;
-    console.log(`${event.eventType} Event received`);
+    console.debug(`${event.eventType} Event received`);
     switch (event.eventType) {
       case "ItemChanged": {
         action = new commonActions.ItemChangedEvent(event.itemCode, event.attributes);
diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts
index 394fc4f..064a94b 100644
--- a/projects/common/src/fm/effects/app-common.effects.ts
+++ b/projects/common/src/fm/effects/app-common.effects.ts
@@ -106,7 +106,7 @@ export class AppCommonEffects {
     ofType(appCommonActions.FAIL),
     map((action) => {
       let failAction = action as appCommonActions.Fail;
-      console.log(failAction.payload)
+      console.debug(failAction.payload)
       return null;
     }));
 
diff --git a/projects/common/src/fm/shared/app.config.factory.ts b/projects/common/src/fm/shared/app.config.factory.ts
index de21fe6..f5634ef 100644
--- a/projects/common/src/fm/shared/app.config.factory.ts
+++ b/projects/common/src/fm/shared/app.config.factory.ts
@@ -21,13 +21,13 @@ export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthS
   return (): Promise<any> => {
     return appConfig.load().then(() => {     
       oauthService.events.subscribe((event) => {
-        console.log(event.type);
+        console.debug(event.type);
         if (event.type == 'token_error' || event.type == 'silent_refresh_timeout') {
           let e = event as OAuthErrorEvent;
           let p = e.params as any;
           if (event.type == 'silent_refresh_timeout' || (p.error && p.error == 'login_required')) {
             let router = injector.get(Router);
-            console.log("Session expired");
+            console.debug("Session expired");
             router.navigate(['loggedout'], { queryParams: { redirectTo: router.url } });
           }          
         }
diff --git a/projects/common/src/fm/shared/app.config.ts b/projects/common/src/fm/shared/app.config.ts
index 9640b7d..57fbc35 100644
--- a/projects/common/src/fm/shared/app.config.ts
+++ b/projects/common/src/fm/shared/app.config.ts
@@ -15,7 +15,7 @@ export class AppConfig {
 
   public getConfig(key: any) {
     if (!this.config.hasOwnProperty(key)) {
-      console.log(`Config key ${key} not set`);
+      console.error(`Config key ${key} not set`);
     }
     return this.config[key];
   }
diff --git a/src/app/menu/menu.component.html b/src/app/menu/menu.component.html
index c0802e6..bfe4657 100644
--- a/src/app/menu/menu.component.html
+++ b/src/app/menu/menu.component.html
@@ -23,10 +23,4 @@
           </li>
         </ul>
     </div>
-       <!--<div class="card menu-card">
-            <ul class="navbar-nav">
-              <li class="nav-item py-0"><a class="nav-link" href="#" (click)="handlePredefinedQuery($event,{itemType:'vnd.farmmaps.itemtype.croppingscheme'})"><span i18n>Farms</span></a></li>
-              <li class="nav-item py-0"><a class="nav-link" href="#" (click)="handlePredefinedQuery($event,{itemType:'vnd.farmmaps.itemtype.layer'})"><span i18n>Layers</span></a></li>
-            </ul>
-          </div>-->
 </div>