removed some wrong stuff that aren't necessary