Ignore default data dir and some cleanup