Switched to dub.json and cleanup