R8 cleans up

Top