Adds cleaner stripping of attributes