remove some stuff and clean up stuffs