Revamp on less useful MVP