Cleaned up some old plugins