Clean up dead code paths

Signed-off-by: TiVo Guy <tivo@wesselworks.com>