Cleaned up unnecessary side effects.