Minor updates
Minor updates and clear out of unused modules