Remove custom_before/after as unnecessary (hurried adding them)