reminder todo and removal of unneccessary enums