Removed error file from teardown scope

Also removed scaffold code