removed old usage of DIR and DS constants