Remove the appdir override (and simplify the params)