added Kasia Stempniak
removed unused structure