code cleanup for sprd package