Unused variable cleanup