Removed a couple of stuff that we don't need.