This also removes the enum shit that was introduced but never merged to master, because we don't need it.