get rid of unused modules and rename others