Cleanup remove unused variable