After removing the enums, the code should be inspected in case there are any usage of the enums left. blocked by #2