UPDATE: Remove references to basepath