removed abunch of stuff