should this deadcode be cleanedup?