Merge "[fwaas] Remove unused methods"