optimized remove border

optimized remove border