Revert "Added more modules"

This reverts commit a50dea4f4f36e79453de58543ef8ef64a0d81cd4.