Feature/mode management

remove these