Cleaned up plugin activation methods