Removing unused modules, and updating comments in the code.