clean up unnecessaries