cleanup for noformat implementation