Removed some  variable usage