Removed duplicate loading of modules