Removed unnecessary option parsing