Cleaned up some plugin dependencies, so that it's not so dependent