Merge "remove dead code and member variables."