As discussed in #28 remove case statements