clean up variable declarations