Removed crap, added something that's needed.