More removal, starting modifications.