Merge "Remove dead code." into devel/master