[CLEANUP] Cleaned code which was contrary to the code style rules and detected by our ci server (jenkins, phpcs).
[CLEANUP] Unused code deleted.
Merge branch 'feature/ci-cleanup' into development