regex cleanup