diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 109d5883..49ba8602 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,24 +1,17 @@
-### Expected behaviour
+### Problem Description
 
-What should happen?
-
-
-### Actual behaviour
-
-What happens instead?
+<!--
+Please read about [reporting bugs](https://github.com/OpenSC/OpenSC/wiki/How-to-report-bugs-so-that-they-can-be-fixed) before opening an issue.
+-->
 
+### Proposed Resolution
 
 ### Steps to reproduce
 
-1. 
-2. 
-3. 
-
-
 ### Logs
 
-Debug output is essential to identify the problem. You can enable debugging by
-editing the file `opensc.conf`:
+<!--
+Debug output is essential to identify the problem. You can enable debugging by editing the file `opensc.conf`:
 ```
     # A debug level of 3 catches most problems
     # Some sensitive data may be logged, too, (e.g. PIN codes)
@@ -28,10 +21,9 @@ editing the file `opensc.conf`:
     #debug_file = opensc-debug.log
 ```
 
-Please use Gist (https://gist.github.com/) or a similar code paster for longer
-logs. Before pasting here, remove your sensitive data from your log (e.g. PIN
-code or certificates).
+Please use [Gist](https://gist.github.com/) or a similar code paster for longer logs. Before pasting here, remove your sensitive data from your log (e.g. PIN code or certificates).
 
 ```
-Paste Log output with less than 10 lines here
+Paste Log output with less than 10 lines here (between the backticks)
 ```
+-->
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index d587910a..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Reporting Bugs
-
-Please read about [reporting bugs](https://github.com/OpenSC/OpenSC/wiki/How-to-report-bugs-so-that-they-can-be-fixed) before opening an issue.