diff --git a/.github/laberer.yml b/.github/laberer.yml
new file mode 100644
index 00000000..f82eb99c
--- /dev/null
+++ b/.github/laberer.yml
@@ -0,0 +1,10 @@
+# Add 'repo' label to any root file changes
+repo:
+  - ./*
+
+@domain/extensions:
+  - src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/extensions/**/*
+
+# Add 'test' label to any change to *.spec.js files within the source dir
+test:
+  - src/**/:^.*Test\.java$
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f6272a99..053f523d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@ node_modules/*
 /yarn.lock
 
 ### VisualStudioCode ###
-.vscode/*
+/.vscode/
 .factorypath
 
 ### VisualStudioCode Patch ###
@@ -45,5 +45,5 @@ node_modules/*
 /target/
 
 # Others
-.sts4-cache
+/.sts4-cache/
 .checkstyle
diff --git a/src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/extensions/dsl/BitBucketPPRHookJobDslExtension.java b/src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/extensions/dsl/BitBucketPPRHookJobDslExtension.java
index 360733ee..42d65599 100644
--- a/src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/extensions/dsl/BitBucketPPRHookJobDslExtension.java
+++ b/src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/extensions/dsl/BitBucketPPRHookJobDslExtension.java
@@ -22,29 +22,13 @@
 
 package io.jenkins.plugins.bitbucketpushandpullrequest.extensions.dsl;
 
-import java.util.ArrayList;
-import java.util.List;
 import hudson.Extension;
 import io.jenkins.plugins.bitbucketpushandpullrequest.BitBucketPPRTrigger;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.BitBucketPPRTriggerFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.pullrequest.cloud.BitBucketPPRPullRequestApprovedActionFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.pullrequest.cloud.BitBucketPPRPullRequestCreatedActionFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.pullrequest.cloud.BitBucketPPRPullRequestMergedActionFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.pullrequest.cloud.BitBucketPPRPullRequestTriggerFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.pullrequest.cloud.BitBucketPPRPullRequestUpdatedActionFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.pullrequest.server.BitBucketPPRPullRequestServerApprovedActionFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.pullrequest.server.BitBucketPPRPullRequestServerCreatedActionFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.pullrequest.server.BitBucketPPRPullRequestServerMergedActionFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.pullrequest.server.BitBucketPPRPullRequestServerTriggerFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.pullrequest.server.BitBucketPPRPullRequestServerUpdatedActionFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.repository.BitBucketPPRRepositoryPushActionFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.repository.BitBucketPPRRepositoryTriggerFilter;
-import io.jenkins.plugins.bitbucketpushandpullrequest.filter.repository.BitBucketPPRServerRepositoryPushActionFilter;
 import javaposse.jobdsl.dsl.helpers.triggers.TriggerContext;
 import javaposse.jobdsl.plugin.ContextExtensionPoint;
 import javaposse.jobdsl.plugin.DslExtensionMethod;
 
-@Extension(optional = true)
+@Extension
 public class BitBucketPPRHookJobDslExtension extends ContextExtensionPoint {
 
   @DslExtensionMethod(context = TriggerContext.class)
@@ -54,140 +38,4 @@ public Object bitbucketTriggers(Runnable closure) {
 
     return new BitBucketPPRTrigger(context.triggers);
   }
-
-  // @Deprecated
-  // @DslExtensionMethod(context = TriggerContext.class)
-  // public Object bitbucketPush() {
-  // return bitbucketRepositoryPushAction(false, null);
-  // }
-
-  @Deprecated
-  @DslExtensionMethod(context = TriggerContext.class)
-  public Object bitbucketRepositoryPushAction(boolean triggerAlsoIfTagPush,
-      boolean triggerAlsoIfNothingChanged, String allowedBranches) {
-    List<BitBucketPPRTriggerFilter> triggers = new ArrayList<>();
-    BitBucketPPRRepositoryPushActionFilter repositoryPushActionFilter =
-        new BitBucketPPRRepositoryPushActionFilter(triggerAlsoIfTagPush,
-            triggerAlsoIfNothingChanged, allowedBranches);
-    BitBucketPPRRepositoryTriggerFilter repositoryTriggerFilter =
-        new BitBucketPPRRepositoryTriggerFilter(repositoryPushActionFilter);
-    triggers.add(repositoryTriggerFilter);
-    return new BitBucketPPRTrigger(triggers);
-  }
-
-  @Deprecated
-  @DslExtensionMethod(context = TriggerContext.class)
-  public Object bitbucketPullRequestApprovedAction(boolean onlyIfReviewersApproved) {
-    List<BitBucketPPRTriggerFilter> triggers = new ArrayList<>();
-    BitBucketPPRPullRequestApprovedActionFilter pullRequestApprovedActionFilter =
-        new BitBucketPPRPullRequestApprovedActionFilter(onlyIfReviewersApproved);
-    BitBucketPPRPullRequestTriggerFilter pullRequestTriggerFilter =
-        new BitBucketPPRPullRequestTriggerFilter(pullRequestApprovedActionFilter);
-    triggers.add(pullRequestTriggerFilter);
-    return new BitBucketPPRTrigger(triggers);
-  }
-
-  @Deprecated
-  @DslExtensionMethod(context = TriggerContext.class)
-  public Object bitbucketPullRequestCreatedAction() {
-    List<BitBucketPPRTriggerFilter> triggers = new ArrayList<>();
-    BitBucketPPRPullRequestCreatedActionFilter pullRequestCreatedActionFilter =
-        new BitBucketPPRPullRequestCreatedActionFilter();
-    BitBucketPPRPullRequestTriggerFilter pullRequestTriggerFilter =
-        new BitBucketPPRPullRequestTriggerFilter(pullRequestCreatedActionFilter);
-    triggers.add(pullRequestTriggerFilter);
-    return new BitBucketPPRTrigger(triggers);
-  }
-
-  @Deprecated
-  @DslExtensionMethod(context = TriggerContext.class)
-  public Object bitbucketPullRequestUpdatedAction() {
-    List<BitBucketPPRTriggerFilter> triggers = new ArrayList<>();
-    BitBucketPPRPullRequestUpdatedActionFilter pullRequestUpdatedActionFilter =
-        new BitBucketPPRPullRequestUpdatedActionFilter();
-    BitBucketPPRPullRequestTriggerFilter pullRequestTriggerFilter =
-        new BitBucketPPRPullRequestTriggerFilter(pullRequestUpdatedActionFilter);
-    triggers.add(pullRequestTriggerFilter);
-    return new BitBucketPPRTrigger(triggers);
-  }
-
-  @Deprecated
-  @DslExtensionMethod(context = TriggerContext.class)
-  public Object bitbucketPullRequestMergedAction() {
-    List<BitBucketPPRTriggerFilter> triggers;
-    BitBucketPPRPullRequestMergedActionFilter pullRequestMegedActionFilter =
-        new BitBucketPPRPullRequestMergedActionFilter();
-    BitBucketPPRPullRequestTriggerFilter pullRequestTriggerFilter =
-        new BitBucketPPRPullRequestTriggerFilter(pullRequestMegedActionFilter);
-    triggers = new ArrayList<>();
-    triggers.add(pullRequestTriggerFilter);
-    return new BitBucketPPRTrigger(triggers);
-  }
-
-  @Deprecated
-  @DslExtensionMethod(context = TriggerContext.class)
-  public Object bitbucketRepositoryServerPushAction(boolean triggerAlsoIfTagPush,
-      boolean triggerAlsoIfNothingChanged, String allowedBranches) {
-    List<BitBucketPPRTriggerFilter> triggers;
-    BitBucketPPRServerRepositoryPushActionFilter repositoryServerPushActionFilter =
-        new BitBucketPPRServerRepositoryPushActionFilter(triggerAlsoIfTagPush,
-            triggerAlsoIfNothingChanged, allowedBranches);
-    BitBucketPPRRepositoryTriggerFilter repositoryServerTriggerFilter =
-        new BitBucketPPRRepositoryTriggerFilter(repositoryServerPushActionFilter);
-    triggers = new ArrayList<>();
-    triggers.add(repositoryServerTriggerFilter);
-    return new BitBucketPPRTrigger(triggers);
-  }
-
-  @Deprecated
-  @DslExtensionMethod(context = TriggerContext.class)
-  public Object bitbucketPullRequestServerApprovedAction(boolean onlyIfReviewersApproved) {
-    List<BitBucketPPRTriggerFilter> triggers;
-    BitBucketPPRPullRequestServerApprovedActionFilter pullRequestServerApprovedActionFilter =
-        new BitBucketPPRPullRequestServerApprovedActionFilter(onlyIfReviewersApproved);
-    BitBucketPPRPullRequestServerTriggerFilter pullRequestServerTriggerFilter =
-        new BitBucketPPRPullRequestServerTriggerFilter(pullRequestServerApprovedActionFilter);
-    triggers = new ArrayList<>();
-    triggers.add(pullRequestServerTriggerFilter);
-    return new BitBucketPPRTrigger(triggers);
-  }
-
-  @Deprecated
-  @DslExtensionMethod(context = TriggerContext.class)
-  public Object bitbucketPullRequestServerCreatedAction() {
-    List<BitBucketPPRTriggerFilter> triggers;
-    BitBucketPPRPullRequestServerCreatedActionFilter pullRequestServerCreatedActionFilter =
-        new BitBucketPPRPullRequestServerCreatedActionFilter();
-    BitBucketPPRPullRequestServerTriggerFilter pullRequestServerTriggerFilter =
-        new BitBucketPPRPullRequestServerTriggerFilter(pullRequestServerCreatedActionFilter);
-    triggers = new ArrayList<>();
-    triggers.add(pullRequestServerTriggerFilter);
-    return new BitBucketPPRTrigger(triggers);
-  }
-
-  @Deprecated
-  @DslExtensionMethod(context = TriggerContext.class)
-  public Object bitbucketPullRequestServerUpdatedAction() {
-    List<BitBucketPPRTriggerFilter> triggers;
-    BitBucketPPRPullRequestServerUpdatedActionFilter pullRequestUpdatedServerActionFilter =
-        new BitBucketPPRPullRequestServerUpdatedActionFilter();
-    BitBucketPPRPullRequestServerTriggerFilter pullRequestServerTriggerFilter =
-        new BitBucketPPRPullRequestServerTriggerFilter(pullRequestUpdatedServerActionFilter);
-    triggers = new ArrayList<>();
-    triggers.add(pullRequestServerTriggerFilter);
-    return new BitBucketPPRTrigger(triggers);
-  }
-
-  @Deprecated
-  @DslExtensionMethod(context = TriggerContext.class)
-  public Object bitbucketPullRequestServerMergedAction() {
-    List<BitBucketPPRTriggerFilter> triggers;
-    BitBucketPPRPullRequestServerMergedActionFilter pullRequestServerMegedActionFilter =
-        new BitBucketPPRPullRequestServerMergedActionFilter();
-    BitBucketPPRPullRequestServerTriggerFilter pullRequestServerTriggerFilter =
-        new BitBucketPPRPullRequestServerTriggerFilter(pullRequestServerMegedActionFilter);
-    triggers = new ArrayList<>();
-    triggers.add(pullRequestServerTriggerFilter);
-    return new BitBucketPPRTrigger(triggers);
-  }
 }