Moved removal of ampersand junk to only if piece isnt getting removed