Remove enum; it has its own package