Removed non importent stuff that was left from the fork.