Removed Options and removed constant definition