Clear up of commented code and redundant class variables