Removed unnecessary modifications