refactor button removal out of logic gates for did select marker method