Remove state and do not embed template