Remove not needed directives, fix saving status