Additional refactoring
Merge branch 'master' of https://github.com/KeironO/AWESOME

* 'master' of https://github.com/KeironO/AWESOME:
  Delete –