Remove "dead" code