Clean up and remove unused variable.