Removing ATL usage