removing unused modules and old comments