remove unnecessary checks; rewrite default action