Cleaned up some code, nothing important
Do not try to import pm2ml if we don't use aria2