Updated: Removed unused class variable