added a few unneded things