little bit of code cleanup
removed experimental modal stuff, accidentally put in master