Issue #199 - Remove the support for basePath for now