Remove hard coded path and deprecated internal APIs