Cleanup for Ganbarou V4.00

Change-Id: Ibf28f7f28767b426324ef14bfd11169f8858fa4f