Removed some strange artifacts that was injected in the last merge.