Removed some old plugin code