remove some useless & cleanup