Merge "cosmetic fixes: removing unused members/imports"