Removed unregister vault from api and minor cleanup.