Added class cleanup on field destroy.

Changed Option to return value if no args passed in.