Making plugins load from a list and removed soem redundant code