diff --git a/client/Nightr/src/app/app.module.ts b/client/Nightr/src/app/app.module.ts
index 46046e5..6185091 100644
--- a/client/Nightr/src/app/app.module.ts
+++ b/client/Nightr/src/app/app.module.ts
@@ -6,8 +6,6 @@ import { AppComponent } from "./app.component";
 import { HomePageComponent } from "./home-page/home-page.component";
 import { MyButtonComponent } from './component/my-button/my-button.component';
 import { NativeScriptHttpClientModule } from "nativescript-angular/http-client";
-import { MyLocationButtonComponent } from './component/locationButton/locationButton.component';
-import { CameraButtonComponent } from './component/camera-button/camera-button.component';
 import { ResultPageComponent } from './result-page/result-page.component';
 
 // Uncomment and add to NgModule imports if you need to use two-way binding
@@ -32,9 +30,7 @@ import { ResultPageComponent } from './result-page/result-page.component';
     ],
     declarations: [
         AppComponent,
-        MyLocationButtonComponent,
         MyButtonComponent,
-        CameraButtonComponent,
         ResultPageComponent,
         HomePageComponent,
     ],
diff --git a/client/Nightr/src/app/component/camera-button/camera-button.component.css b/client/Nightr/src/app/component/camera-button/camera-button.component.css
deleted file mode 100644
index bcd4764..0000000
--- a/client/Nightr/src/app/component/camera-button/camera-button.component.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add mobile styles for the component here.  */
diff --git a/client/Nightr/src/app/component/camera-button/camera-button.component.html b/client/Nightr/src/app/component/camera-button/camera-button.component.html
deleted file mode 100644
index 4fe4caf..0000000
--- a/client/Nightr/src/app/component/camera-button/camera-button.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<Button text="camera-button works!" class="btn btn-primary" (tap)="onTap()"></Button>
diff --git a/client/Nightr/src/app/component/camera-button/camera-button.component.ts b/client/Nightr/src/app/component/camera-button/camera-button.component.ts
deleted file mode 100644
index d3bd803..0000000
--- a/client/Nightr/src/app/component/camera-button/camera-button.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { MyCameraService } from '../../services/my-camera-service';
-
-@Component({
-  selector: 'ns-camera-button',
-  templateUrl: './camera-button.component.html',
-  styleUrls: ['./camera-button.component.css'],
-  moduleId: module.id,
-})
-export class CameraButtonComponent implements OnInit {
-
-    camera:MyCameraService = new MyCameraService();
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-  onTap() {
-    this.camera.takePicture().then(
-        (res) => {console.log(res)}, () => {}
-    );
-}
-
-}
diff --git a/client/Nightr/src/app/component/locationButton/locationButton.component.css b/client/Nightr/src/app/component/locationButton/locationButton.component.css
deleted file mode 100644
index bcd4764..0000000
--- a/client/Nightr/src/app/component/locationButton/locationButton.component.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add mobile styles for the component here.  */
diff --git a/client/Nightr/src/app/component/locationButton/locationButton.component.html b/client/Nightr/src/app/component/locationButton/locationButton.component.html
deleted file mode 100644
index 9fe4bc3..0000000
--- a/client/Nightr/src/app/component/locationButton/locationButton.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<StackLayout>
-<Button text="{{title}}" class="btn btn-primary" (tap)="onTap($event)"></Button>
-<Label text="{{lat}}"></Label>
-</StackLayout>
diff --git a/client/Nightr/src/app/component/locationButton/locationButton.component.ts b/client/Nightr/src/app/component/locationButton/locationButton.component.ts
deleted file mode 100644
index d28c873..0000000
--- a/client/Nightr/src/app/component/locationButton/locationButton.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
-import { TouchGestureEventData, GestureEventData } from 'tns-core-modules/ui/gestures'
-import { MyGeoLocationService} from '../../services/my-geo-location.service';
-@Component({
-  selector: 'ns-locationButton',
-  templateUrl: './locationButton.component.html',
-  styleUrls: ['./locationButton.component.css'],
-  moduleId: module.id,
-})
-export class MyLocationButtonComponent implements OnInit {
-    title = "Click to get location!";
-    lat = "start";
-    geoLocationService = new MyGeoLocationService();
-
-    @Output() tap: EventEmitter<GestureEventData> = new EventEmitter<GestureEventData>();
-
-  constructor() {
-  }
-  ngOnInit() {
-  }
-
-  onTap(args: GestureEventData): any {
-    this.tap.emit(args);
-    this.geoLocationService.getLocation().then(location => {
-        this.lat = ""+location.latitude;
-    }).catch(error => {
-    });
-  }
-}
diff --git a/client/Nightr/src/app/home-page/home-page.component.ts b/client/Nightr/src/app/home-page/home-page.component.ts
index 15debd5..f239bd7 100644
--- a/client/Nightr/src/app/home-page/home-page.component.ts
+++ b/client/Nightr/src/app/home-page/home-page.component.ts
@@ -26,7 +26,6 @@ export class HomePageComponent implements OnInit {
     }
 
     public toggleFlatEarth(args) {
-        console.log('Reached toggleFlatearch');
         let firstSwitch = <Switch>args.object;
         if (firstSwitch.checked) {
             this.isEarthFlat = true;
@@ -45,7 +44,6 @@ export class HomePageComponent implements OnInit {
         } else {
             this.inAustralia = false;
             appSettings.setBoolean("applicationinAustralia", false);
-            console.log('isEarthflat', this.isEarthFlat);
         }
     }
 
@@ -55,7 +53,6 @@ export class HomePageComponent implements OnInit {
                 isEarthFlat: this.isEarthFlat,
                 inAustralia: this.inAustralia  }
           }
-        //console.log('this is inAustralia', this.inAustralia, 'This is isEarthFlat', this.isEarthFlat);
         this.routerExtensions.navigateByUrl("/result-page"), navigationExtras;
     }
 }
diff --git a/client/Nightr/src/app/result-page/result-page.component.ts b/client/Nightr/src/app/result-page/result-page.component.ts
index 0f6e194..b19dd1c 100644
--- a/client/Nightr/src/app/result-page/result-page.component.ts
+++ b/client/Nightr/src/app/result-page/result-page.component.ts
@@ -50,7 +50,6 @@ export class ResultPageComponent implements OnInit {
     return this.cameraService.takePicture().
     then(picture => {
         this.image = JSON.stringify(picture);
-        //console.log('this is picture in json', JSON.stringify(picture));
         this.getLocation();
     })
   }
@@ -58,7 +57,6 @@ export class ResultPageComponent implements OnInit {
   public getLocation(): any {
     this.geoLocationService.getLocation().then(location => {
         this.locationData = location;
-        //console.log('this is locationData', this.locationData);
         this.submit();
     }).catch(error => {
     });
@@ -74,11 +72,9 @@ private makePostRequest(): void {
              flat_earth: appSettings.getBoolean("applicationIsEarthFlat", false),
               in_australia: appSettings.getBoolean("applicationinAustralia", false), })
         .subscribe(res => {
-            console.log('This is res', res);
             this.JSONObject = res;
             this.isBusy = false;
             this.addToArray();
-            //console.log('THis is myreturnJSON', this.myReturnJSON);
         });
 }
 
diff --git a/client/Nightr/src/main.js b/client/Nightr/src/main.js
index d07591d..faf70ce 100644
--- a/client/Nightr/src/main.js
+++ b/client/Nightr/src/main.js
@@ -11,4 +11,4 @@ var app_module_1 = require("./app/app.module");
 // so we provide a wrapper platform object, platformNativeScriptDynamic,
 // that sets up a NativeScript application and can bootstrap the Angular framework.
 platform_1.platformNativeScriptDynamic().bootstrapModule(app_module_1.AppModule);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1haW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwR0FBMEc7QUFDMUcsMERBQTRFO0FBRTVFLCtDQUE2QztBQUU3QyxnRkFBZ0Y7QUFDaEYsMEVBQTBFO0FBQzFFLHNFQUFzRTtBQUN0RSx5REFBeUQ7QUFDekQseUVBQXlFO0FBQ3pFLHdFQUF3RTtBQUN4RSxtRkFBbUY7QUFDbkYsc0NBQTJCLEVBQUUsQ0FBQyxlQUFlLENBQUMsc0JBQVMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBpbXBvcnQgc2hvdWxkIGJlIGZpcnN0IGluIG9yZGVyIHRvIGxvYWQgc29tZSByZXF1aXJlZCBzZXR0aW5ncyAobGlrZSBnbG9iYWxzIGFuZCByZWZsZWN0LW1ldGFkYXRhKVxuaW1wb3J0IHsgcGxhdGZvcm1OYXRpdmVTY3JpcHREeW5hbWljIH0gZnJvbSBcIm5hdGl2ZXNjcmlwdC1hbmd1bGFyL3BsYXRmb3JtXCI7XG5cbmltcG9ydCB7IEFwcE1vZHVsZSB9IGZyb20gXCIuL2FwcC9hcHAubW9kdWxlXCI7XG5cbi8vIEEgdHJhZGl0aW9uYWwgTmF0aXZlU2NyaXB0IGFwcGxpY2F0aW9uIHN0YXJ0cyBieSBpbml0aWFsaXppbmcgZ2xvYmFsIG9iamVjdHMsXG4vLyBzZXR0aW5nIHVwIGdsb2JhbCBDU1MgcnVsZXMsIGNyZWF0aW5nLCBhbmQgbmF2aWdhdGluZyB0byB0aGUgbWFpbiBwYWdlLlxuLy8gQW5ndWxhciBhcHBsaWNhdGlvbnMgbmVlZCB0byB0YWtlIGNhcmUgb2YgdGhlaXIgb3duIGluaXRpYWxpemF0aW9uOlxuLy8gbW9kdWxlcywgY29tcG9uZW50cywgZGlyZWN0aXZlcywgcm91dGVzLCBESSBwcm92aWRlcnMuXG4vLyBBIE5hdGl2ZVNjcmlwdCBBbmd1bGFyIGFwcCBuZWVkcyB0byBtYWtlIGJvdGggcGFyYWRpZ21zIHdvcmsgdG9nZXRoZXIsXG4vLyBzbyB3ZSBwcm92aWRlIGEgd3JhcHBlciBwbGF0Zm9ybSBvYmplY3QsIHBsYXRmb3JtTmF0aXZlU2NyaXB0RHluYW1pYyxcbi8vIHRoYXQgc2V0cyB1cCBhIE5hdGl2ZVNjcmlwdCBhcHBsaWNhdGlvbiBhbmQgY2FuIGJvb3RzdHJhcCB0aGUgQW5ndWxhciBmcmFtZXdvcmsuXG5wbGF0Zm9ybU5hdGl2ZVNjcmlwdER5bmFtaWMoKS5ib290c3RyYXBNb2R1bGUoQXBwTW9kdWxlKTtcbiJdfQ==
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1haW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwR0FBMEc7QUFDMUcsMERBQTRFO0FBRTVFLCtDQUE2QztBQUU3QyxnRkFBZ0Y7QUFDaEYsMEVBQTBFO0FBQzFFLHNFQUFzRTtBQUN0RSx5REFBeUQ7QUFDekQseUVBQXlFO0FBQ3pFLHdFQUF3RTtBQUN4RSxtRkFBbUY7QUFDbkYsc0NBQTJCLEVBQUUsQ0FBQyxlQUFlLENBQUMsc0JBQVMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBpbXBvcnQgc2hvdWxkIGJlIGZpcnN0IGluIG9yZGVyIHRvIGxvYWQgc29tZSByZXF1aXJlZCBzZXR0aW5ncyAobGlrZSBnbG9iYWxzIGFuZCByZWZsZWN0LW1ldGFkYXRhKVxyXG5pbXBvcnQgeyBwbGF0Zm9ybU5hdGl2ZVNjcmlwdER5bmFtaWMgfSBmcm9tIFwibmF0aXZlc2NyaXB0LWFuZ3VsYXIvcGxhdGZvcm1cIjtcclxuXHJcbmltcG9ydCB7IEFwcE1vZHVsZSB9IGZyb20gXCIuL2FwcC9hcHAubW9kdWxlXCI7XHJcblxyXG4vLyBBIHRyYWRpdGlvbmFsIE5hdGl2ZVNjcmlwdCBhcHBsaWNhdGlvbiBzdGFydHMgYnkgaW5pdGlhbGl6aW5nIGdsb2JhbCBvYmplY3RzLFxyXG4vLyBzZXR0aW5nIHVwIGdsb2JhbCBDU1MgcnVsZXMsIGNyZWF0aW5nLCBhbmQgbmF2aWdhdGluZyB0byB0aGUgbWFpbiBwYWdlLlxyXG4vLyBBbmd1bGFyIGFwcGxpY2F0aW9ucyBuZWVkIHRvIHRha2UgY2FyZSBvZiB0aGVpciBvd24gaW5pdGlhbGl6YXRpb246XHJcbi8vIG1vZHVsZXMsIGNvbXBvbmVudHMsIGRpcmVjdGl2ZXMsIHJvdXRlcywgREkgcHJvdmlkZXJzLlxyXG4vLyBBIE5hdGl2ZVNjcmlwdCBBbmd1bGFyIGFwcCBuZWVkcyB0byBtYWtlIGJvdGggcGFyYWRpZ21zIHdvcmsgdG9nZXRoZXIsXHJcbi8vIHNvIHdlIHByb3ZpZGUgYSB3cmFwcGVyIHBsYXRmb3JtIG9iamVjdCwgcGxhdGZvcm1OYXRpdmVTY3JpcHREeW5hbWljLFxyXG4vLyB0aGF0IHNldHMgdXAgYSBOYXRpdmVTY3JpcHQgYXBwbGljYXRpb24gYW5kIGNhbiBib290c3RyYXAgdGhlIEFuZ3VsYXIgZnJhbWV3b3JrLlxyXG5wbGF0Zm9ybU5hdGl2ZVNjcmlwdER5bmFtaWMoKS5ib290c3RyYXBNb2R1bGUoQXBwTW9kdWxlKTtcclxuIl19
\ No newline at end of file