removing enum logic