removed obsolete markup
added simulator check