uuid-based enc dir fix
cleanup