delete deadcode and further cleanup