delete some unused things
fix style