Cleaned up old garbage. TODO: Fix effect bug