Removed ATL dependence