Remove auto p & br tags form shortcode

// matter remove auto P tag

function matter_remove_wpautop( $content, $autop = false ) {

    if ( $autop ) { // Possible to use !preg_match('('.WPBMap::getTagsRegexp().')', $content)
        $content = wpautop( preg_replace( '/<\/?p\>/', "\n", $content ) . "\n" );
    }
    return do_shortcode( shortcode_unautop( $content) );
}

// remove br tags form bootstrap shortcode

function matter_the_content_filter($content) {
    $block = join("|",array("row", "column"));
    $rep = preg_replace("/(<p>)?\[($block)(\s[^\]]+)?\](<\/p>|<br \/>)?/","[$2$3]",$content);
    $rep = preg_replace("/(<p>)?\[\/($block)](<\/p>|<br \/>)?/","[/$2]",$rep);
return $rep;
}
add_filter("the_content", "matter_the_content_filter");