Removed silly include, removed obsolote enum value