added prefix and postfix cleanup helpers