Removed verbose attributes on cleanup