Onja would quite sure point these out on mergerequest, so made them before mergerequest :)

code/moya-angular/src/app/modules/viplist/viplist.service.ts

@@ -70,7 +70,6 @@ export class ViplistService {
    */
    */
   public get(): Observable<Array<Vip>> {
   public get(): Observable<Array<Vip>> {
     return this.apollo.watchQuery<VipsQueryRoot>({query: Q_VIPS_N_DATA}).valueChanges.pipe(map(x => { console.log(x.data.vips); return x.data.vips; }));
     return this.apollo.watchQuery<VipsQueryRoot>({query: Q_VIPS_N_DATA}).valueChanges.pipe(map(x => { console.log(x.data.vips); return x.data.vips; }));
-    // return this.apollo.query<vipsQueryRoot>({query: Q_VIPS_N_DATA}).pipe(map(x => x.data.vips));
   }
   }
 
 
 
 
@@ -100,12 +99,6 @@ export class ViplistService {
   public create(vip: Vip): Observable<Vip> {
   public create(vip: Vip): Observable<Vip> {
     return this.http.post(MOYA_BASE_URL + 'v3/vip/create', vip).pipe(map(x => x as Vip));
     return this.http.post(MOYA_BASE_URL + 'v3/vip/create', vip).pipe(map(x => x as Vip));
   }
   }
-/*
-  private hostPopulator(rawVip: any): Observable<Vip> {
-    return this.userService.get(rawVip.hostId).pipe(
-      map((u: User) => {rawVip.host = u; return <Vip> rawVip; }),map(x => x as Vip),);
-  }*/
-
 
 
 }
 }
 
 

code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java

@@ -626,9 +626,7 @@ public class BootstrapBean implements BootstrapBeanLocal {
 			"ALTER TABLE compo_voting_roles ADD CONSTRAINT FK_compo_voting_roles_scheme_id FOREIGN KEY (scheme_id) REFERENCES compo_voting_schemes (id)",
 			"ALTER TABLE compo_voting_roles ADD CONSTRAINT FK_compo_voting_roles_scheme_id FOREIGN KEY (scheme_id) REFERENCES compo_voting_schemes (id)",
 			"ALTER TABLE compo_voting_roles ADD CONSTRAINT FK_compo_voting_roles_role_id FOREIGN KEY (role_id) REFERENCES roles (id)",
 			"ALTER TABLE compo_voting_roles ADD CONSTRAINT FK_compo_voting_roles_role_id FOREIGN KEY (role_id) REFERENCES roles (id)",
 		});
 		});
-
-
-
+		
 		dbUpdates.add(new String[]{
 		dbUpdates.add(new String[]{
 				"ALTER TABLE users DROP COLUMN postal_town;"
 				"ALTER TABLE users DROP COLUMN postal_town;"
 		});
 		});

code/moya-web/src/main/java/fi/codecrew/moya/graphql/MoyaGraphQLServlet.java

@@ -365,7 +365,6 @@ public class MoyaGraphQLServlet extends HttpServlet {
 			b.addField(User_.email);
 			b.addField(User_.email);
 			b.addField(User_.address);
 			b.addField(User_.address);
 			b.addField(User_.zip);
 			b.addField(User_.zip);
-			//b.addField(User_.postalTown);
 			b.addField(User_.town);
 			b.addField(User_.town);
 			b.addField(User_.phone);
 			b.addField(User_.phone);
 			b.addField(User_.gender);
 			b.addField(User_.gender);