Removed some depricated dir here...