Remove modal stuff for #10