Removed usless XXX_DIR stuff.