Removed a lot of unused modules