Peer ruebeau

Some more cleanup.