Removing unused modules
Minor refactoring