Remove hack class and explicit scope