remove some unused libs
small comment update & indentation