Remove need for a static dir option