clean up all the extra