New vars, cleanup
New vars, cleanup