Removed all warnings except one due to macro use
Removed as many glob inputs as reasonable