Another go at removing ends nicely