Removes unused module
Minor changes