Some cleanup on effects