Optimize: this time CircleBattery and Clock

cheers

Change-Id: I08dbd8c23a751101b40eae3967b06c9daa622022