Removed vault dependency
Complete