remove some unused
fix startup