Cleaned up plugins