Is already removed... removed all helpers / enum / simple cases. Just including `Widget` class and `Modal` for review before moving onwards