Removed several useless class variables