Hole Feature: Removed unnecessary class variables