More magic cleanup