Removed unnecessary non-default data dir and made idempotent