Merge "Refactor unused methods and unnecessary members."