Cleanup around modals controller using observable options object