Removed unused modules and added some used modules