Cleanups and effects updates