removed more unconfirmed stuff