Kill some various things.
Merge pull request #38 from bukzor/kill_various_things

Kill some various things.