Fixed unterminated comments in legacy config files
Fixed unused use statements