Modules removal. Making it leaner.