Remove dependency on plugins