Clean up codes

reviewer: @tkawachi