Removed a couple of unused modules
Various changes