Helper cleanup