Set Doxygen @ingroup appropriately

Change-Id: Ied9d0072c1ee18a7128ba70d8de45cd67b4deb71
Remove unused override

Change-Id: Ib7f5b67b8dfab32a85af26898da3fb7270d6d750