Removed ugly stuffs