Clean up stray variables