removed some deadcode