Cleanup for Ganbarou V4.00

Change-Id: I5e9e478b81eafeb8b3ef3ea7d9a4863a25f6e27d