remove pw stuff