Removed needed options functions