Cleanup as discussed in #33

Alright, here's the pull-request as discussed in issue #33
I successfully tested this build with KillingFloor but it might need some more testing before being pushed into the wild as there were some big changes.