Removed unused modules. If it is found they are needed, they will be added on a case-by-case basis.