rhine: Clean up old cruft

Change-Id: Idd6a6f28e6189aa548ecceb51f535a15b36db7e2