Merge pull request #444 from bdon/master

dead code cleanup