removing more pw stuff