Cleanup variable allocation :-)