removed some unusedstuff