Removed unnecessary code blocks