Remove unnecessary methods and fix local filesystem dependency