Remove unused variable references