#760 Clean up variables