Remove me some junk code
Merge branch 'develop' of https://github.com/leerbedrijflisa/kiwi into develop