Removed codes that still uses unusable variables