Replace plugin with self where possible