Removed unused code and tidy up
Removed unused code and tidy up

bastianh/swampdragon,seclinch/swampdragon,michael-k/swampdragon,h-hirokawa/swampdragon,jonashagstedt/swampdragon,aexeagmbh/swampdragon,denizs/swampdragon,faulkner/swampdragon,bastianh/swampdragon,sahlinet/swampdragon,denizs/swampdragon,michael-k/swampdragon,faulkner/swampdragon,d9pouces/swampdragon,d9pouces/swampdragon,h-hirokawa/swampdragon,bastianh/swampdragon,sahlinet/swampdragon,Manuel4131/swampdragon,sahlinet/swampdragon,boris-savic/swampdragon,seclinch/swampdragon,Manuel4131/swampdragon,seclinch/swampdragon,denizs/swampdragon,boris-savic/swampdragon,jonashagstedt/swampdragon,michael-k/swampdragon,d9pouces/swampdragon,jonashagstedt/swampdragon,boris-savic/swampdragon,aexeagmbh/swampdragon,aexeagmbh/swampdragon,Manuel4131/swampdragon,faulkner/swampdragon