Test for selfkill added, some not used classes removed,
minor revision
version 0.6