Cleanup vars

Cleanup vars