Removed commented out variables