Cleaned up Suicide plugin