Replacing manual require's with lazyload module
Cleaned up